From: Glenn Morris <rgm@gnu.org>
Date: Wed, 6 Feb 2013 08:27:41 +0000 (-0800)
Subject: * vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~883
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5fd03926b34b26255bbde9dc1696183625f8be03;p=emacs.git

* vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links
if we can't get user input.

Fixes: debbugs:6567
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0be77ed6737..96c390b2aeb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-02-06  Glenn Morris  <rgm@gnu.org>
 
+	* vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links
+	if we can't get user input.  (Bug#6567)
+
 	* startup.el (command-line): If simple.el is missing,
 	test and warn about for some possible causes.
 
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 541b0c04b0b..818b37b3c34 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -866,6 +866,13 @@ current, and kill the buffer that visits the link."
 		 (message
 		  "Warning: symbolic link to %s-controlled source file" link-type))
 		((or (not (eq vc-follow-symlinks 'ask))
+		     ;; Assume we cannot ask, default to yes.
+		     noninteractive
+		     ;; Copied from server-start.  Seems like there should
+		     ;; be a better way to ask "can we get user input?"...
+		     (and (daemonp)
+			  (null (cdr (frame-list)))
+			  (eq (selected-frame) terminal-frame))
 		     ;; If we already visited this file by following
 		     ;; the link, don't ask again if we try to visit
 		     ;; it again.  GUD does that, and repeated questions